Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Sep 2011 17:42:21 +0000 (10:42 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Sep 2011 17:42:21 +0000 (10:42 -0700)

Trivial merge